(dired-get-filename): Don't call encode-coding-string

if default-file-name-coding-system is non-nil.

diff --git a/lisp/dired.el b/lisp/dired.el
index afa98562f808e9837fe8322218c24770ab6a3a12..34b1d50ad90eeccc2c8da489c4a1bfa9331e0f70 100644 (file)
--- a/lisp/dired.el
+++ b/lisp/dired.el
@@ -1304,6 +1304,7 @@ Optional arg NO-ERROR-IF-NOT-FILEP means return nil if no filename on
                         "\"")))))
     (and file buffer-file-coding-system
         (not file-name-coding-system)
+        (not default-file-name-coding-system)
         (setq file (encode-coding-string file buffer-file-coding-system)))
     (if (eq localp 'no-dir)
        file